Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Wed, 18 Jul 2007 12:56:21 +0000 (13:56 +0100)
committerTim Deegan <Tim.Deegan@xensource.com>
Wed, 18 Jul 2007 12:56:21 +0000 (13:56 +0100)

Trivial merge